testsuite: Fix notify tests

GtkStatusIcon tests don't work well under xwayland either, so just
skip them unconditionally.
GtkEntry now fails because the update of the im-module is no longer
deferred to an idle, and (gtk-im-simple) is not a valid module
name, so skip this property.

diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index e15a4a886e0f88576cb82ea6f935860703e5cc5b..9468593c6b2ccb4512a24face9bd8cbdb514636f 100644 (file)
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -423,13 +423,8 @@ test_type (gconstpointer data)
     return;
 #endif
 
-#ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
-    {
-      if (g_type_is_a (type, GTK_TYPE_STATUS_ICON))
-        return;
-    }
-#endif
+  if (g_type_is_a (type, GTK_TYPE_STATUS_ICON))
+    return;
 
   klass = g_type_class_ref (type);
 
@@ -490,6 +485,10 @@ test_type (gconstpointer data)
             ))
        continue;
 
+      if (pspec->owner_type == GTK_TYPE_ENTRY &&
+          g_str_equal (pspec->name, "im-module"))
+        continue;
+
       if (type == GTK_TYPE_SETTINGS)
         continue;